net/tls.el (open-tls-stream): Don't set the dont-query-on-exit flag.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 74aa3608a5faf3e111db3d10d16ba1540529dc06..fc3cb888200cb81013b7cca16b2871203b5ff4a8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,10 @@
        when doing the prompting for `sendmail-query-once' before sending
        in Message buffers (bug#10897).
 
+       * net/tls.el (open-tls-stream): Don't set the dont-query-on-exit flag.
+       This is inconsistent with all the other stream functions, which leave
+       the setting up to the higher levels (if so wanted) (bug#10931).
+
 2012-03-02  Alan Mackenzie  <acm@muc.de>
 
        Depessimize the handling of very large macros.

diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index 9b9eb6f8f2ece9fdcc6a1f13dfbda1769d3c1910..d232095444bdb3087893492f79dedeac5add3bb6 100644 (file)
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -237,10 +237,6 @@ Fourth arg PORT is an integer specifying a port to connect to."
          (setq process (start-process
                         name buffer shell-file-name shell-command-switch
                         formatted-cmd))
-         (funcall (if (fboundp 'set-process-query-on-exit-flag)
-                      'set-process-query-on-exit-flag
-                    'process-kill-without-query)
-                  process nil)
          (while (and process
                      (memq (process-status process) '(open run))
                      (progn